From 32231fe14281ff12effe58e1f80d79491312f437 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Tue, 11 Dec 2001 01:40:54 +0000 Subject: [PATCH] remove <<<<<<< --- ChangeLog | 1 - ChangeLog.pre-2-0 | 1 - ChangeLog.pre-2-10 | 1 - ChangeLog.pre-2-2 | 1 - ChangeLog.pre-2-4 | 1 - ChangeLog.pre-2-6 | 1 - ChangeLog.pre-2-8 | 1 - 7 files changed, 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe8b09c5d5..82603314e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,7 +84,6 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++, per jrb's request ->>>>>>> 1.2684 2001-12-08 Anders Carlsson * tests/testgtk.c (layout_expose_handler): Don't return TRUE diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index fe8b09c5d5..82603314e9 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -84,7 +84,6 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++, per jrb's request ->>>>>>> 1.2684 2001-12-08 Anders Carlsson * tests/testgtk.c (layout_expose_handler): Don't return TRUE diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fe8b09c5d5..82603314e9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -84,7 +84,6 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++, per jrb's request ->>>>>>> 1.2684 2001-12-08 Anders Carlsson * tests/testgtk.c (layout_expose_handler): Don't return TRUE diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index fe8b09c5d5..82603314e9 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -84,7 +84,6 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++, per jrb's request ->>>>>>> 1.2684 2001-12-08 Anders Carlsson * tests/testgtk.c (layout_expose_handler): Don't return TRUE diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index fe8b09c5d5..82603314e9 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -84,7 +84,6 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++, per jrb's request ->>>>>>> 1.2684 2001-12-08 Anders Carlsson * tests/testgtk.c (layout_expose_handler): Don't return TRUE diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fe8b09c5d5..82603314e9 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -84,7 +84,6 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++, per jrb's request ->>>>>>> 1.2684 2001-12-08 Anders Carlsson * tests/testgtk.c (layout_expose_handler): Don't return TRUE diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fe8b09c5d5..82603314e9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -84,7 +84,6 @@ Sat Dec 8 20:57:24 2001 Kristian Rietveld * gtk/gtkliststore.c (gtk_list_store_remove): nuke the stamp++, per jrb's request ->>>>>>> 1.2684 2001-12-08 Anders Carlsson * tests/testgtk.c (layout_expose_handler): Don't return TRUE -- 2.30.2